Merge "Rehab parts of CollapsedStatusBarFragmentTest." into sc-v2-dev