Merge "Allow setSupportActionBar() to take a null param" into mnc-ub-dev