Merge "Final tweaks to power menu" into oc-dr1-dev