Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev