Merge "Adjust keyguard preview renderer to allow different displays" into main