Merge "Ensure visible activities when device is unlocked." into oc-dev