Squashed 2 commits to GlobalActions:

GlobalActions: Fix possible race condition when showing dialog.
Depending on the presence of a previous dialog, the newly generated one
gets either immediately displayed (no old dialog) or shortly delayed
(after dismissal of the existing one).
If a new show event happens (by rapid fire of the power key, for instance,
using a keyboard with fast-repeating events) during that delay, a new
dialog will be immediately displayed, and when the delayed show triggers
it'll conflict with it (and bring everything down).

This moves the creation of the new Dialog object to _before_ showing
it (delayed or not), instead of the show method itself, to ensure the
object isn't clobbered by competing/sequential calls to handleShow()

Change-Id: Ie4d9a8507ebaf59da31869c38b98c3c98a74468e1

GlobalActions: Fix dialog dismissal
The themeability of the global actions dialog introduced by
change I644e2e8d7d4abf07bae639b606197d691f16adac broke the
hook that prevented multiple instances of that dialog, and
multiple instances of it will cause framework crashes due to
mismatches variable references (besides looking weird).

Fix it by restoring the original dismissal condition and forcing
a recreation of the theme context if necessary.

Change-Id: Ic6e06bef18fa9e09c84c774fa273f1b7e3bf9630

committed by rmcc to cm/cm10.1

Signed-off-by: travp624 <travp624@gmail.com>
policy: update(fix?) lockscreen rotation logic

Change-Id: Ided3c8cd4f52ebd4805189168e13506f74f3443a
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge remote-tracking branch 'origin/jb-4.2' into jb-4.2