* commit '2cc0b5143e82d57bea0871cbfda28489f726e6ed': Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
* commit '2cc0b5143e82d57bea0871cbfda28489f726e6ed': Partially revert "Conditionally remove Dock settings shortcut and Power control widget."