Merge "Fix color in KitchenSink Activity"