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

* commit 'd00380a560dff6a2237086f2f4c96313785ce93f':
  WindowDecorActionBar name change fix.