Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev