automerge: 5ad0763 * commit '5ad076396c43b2d26f9c020f0914623972cadd0e': Use the right layout for inflating Action Bar.