Merge "Fix oversized icons and removed title line limit." into cw-f-dev
am: ff2d91fa07

Change-Id: If711cf676853dd470fdd1eec2cadbe8a8033df1d