Merge "Prevents activity becomes invisible while keyguard going-away" into main