Merge "Finish unlocking user before touching apps."