Merge "Unify code paths for collapsing action views in action bars" into lmp-dev