automerge: 8e2dd14 * commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c': Special case AppCompat to show action bar.