Fix indents
Respect package disabled settings for action bar changes