Merge "Frameworks: privacy guard fix UI freeze" into jb4.2

Change-Id: I73299467cd933a27df657489c5a650b762e696b9