Merge "Separate power button preference controller from accessibility"