Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev