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