Merge "Dismiss docked stack if an activity is shown on top of the lock screen"...
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d
am: d9125edb
* commit 'd9125edb':
Dismiss docked stack if an activity is shown on top of the lock screen
Change-Id: I0b0130142296468e43fdb106d214f43a8fc500e5