Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev