Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev