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

Change-Id: Id4e4d9e57c24280fe968006893910c273d9f556f