am 379ac2d8: Merge "Fix broken status bar when activity is showing above keyguard"

* commit '379ac2d8b69065eb22ee24d9f3e4d90ec62bc413':
  Fix broken status bar when activity is showing above keyguard