Merge "Catch SecurityException in SystemUIProxy" into main