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

* commit 'da5929914b618678f462c1a24ee042ff25001a0c':