Merge "Fix standalone action mode not respecting app:showAsAction" into mnc-ub-dev