Merge "Renamed "Demo mode" to "System UI demo mode""