* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4': Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4': Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.