Merge "Ensure visible activities when device is unlocked." into oc-dev am: 293afb3917
am: 1ee52a4c36

Change-Id: I7a28d14975dc9947e08eed48a610552c56e32984