* commit '270c099faf63868dcc21836a84de778337ff3be9': Move emulator check & save system properties access