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

Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3