Merge "Keep keyguard visible if we're launching an occluding activity over a going-away keyguard." into tm-qpr-dev