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

Change-Id: I7e8827cdc75212223fa9e42852f8505dbebee8eb