Merge "Tweak the ui based on the Android S design" into sc-dev