automerge: bb600de * commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213': Special case AppCompat to show action bar.