Merge "Update ActionBar implementations to APIv18 spec" into klp-ub-dev