Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07ca am: beae6de446 am: 0dcee1fba0 am: 950f61bf8b
Change-Id: If72506c94754ed95312e9587621a84800f2606e4
This commit is contained in: