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