Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev