Update Ace 2 Settings from CM 11 branch