Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev