* commit '4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a': Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
* commit '4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a': Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.