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