Merge "Merge "Rehab parts of CollapsedStatusBarFragmentTest." into sc-v2-dev am: c7f6a0750e am: 7f33fe9c2f"