Merge "Add screenshot back to power menu for some devices"