Merge "Consider lock state when determining next activity to become visible." into pi-dev
am: 00f4a4bc74

Change-Id: Ied73f5090e5c790c884d817ac57399d70952ff6f