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