* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d': Revert "Camera: Add new capability flags as system features as well"