Merge "Always add PhoneWindow when creating DecorView."