Merge "Implement bug 4500971 - Collapsable action views"