Merge "Change overlay on background thread."