Update Ace 2 settings and init from CM11 branch