Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07ca am: e5136e9514 am: ae7636e166
Change-Id: Ie0fe0e3a0e7fd39f77544b827d9bd1c62684f548
This commit is contained in: