Merge "App that changes screen to multiple colors" am: bd09ce590c am: c32890e0bd
am: 0f4d8fa630

Change-Id: I2958c510506e72fcb5ec976314cf8ee5442c8e8d