Merge "Add support for tools:menu" into idea133