Tweak 240x240 theme

Change-Id: I0801d29aeb66678157123e3630b09a2b527ad4df
Merge "Tweak 240x240 theme" into android-4.4