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

Change-Id: Ia4ae5604481c6b699a848acd76f40bc5fd973bd2