Merge "Camera button support (1/2)" into cm-11.0