Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev