Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07 am: e5136e95 Change-Id: Ic2d3d0f7141ec29dbeef852493bdc021645d7c3d