Merge "Properly launch activities that show over lock" into main