Merge "Show Alert dialog on Hide when locked is enabled" into main