Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev am: bdf8770ae3
am: 91d15b83c3

Change-Id: Ib3cf2b1160111805c45f2211536a2f4edc5f5560