Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into rvc-dev