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

* commit 'ce400cd75e1e1a90c0b4da4de90d7314fd21dca8':