Merge "Keyguard was hiding occluding activities" into tm-dev