Merge "Allow home app being instrumented while starting home from PhoneWindowManager"