Merge ""Fix" NPE in PhoneStatusBarPolicy"