Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev