Merge "Fully remove Toolbar children when action views expand" into mnc-dev