Merge "Fix context and resources used for keyguard presentation" into main