Merge "Don't show taskbar when keyguard occluded" into sc-v2-dev