Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
am: 80bd5e6fd7

* commit '80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
  WindowDecorActionBar name change fix.