Merge "WindowDecorActionBar name change fix." into mnc-ub-dev