Merge changes Ia6fe9724,I682b9acb into lmp-dev

* changes:
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer