Merge "Start unaware persistent apps after user unlocked." into nyc-dev