Merge "Honor app:theme in Toolbar on Lollipop" into lmp-mr1-ub-dev