Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev