Merge "Fix calling ActionMode optional title methods pre-v16" into klp-ub-dev