Merge "Fix bug 3497307 - Fix issues with FEATURE_ACTION_MODE_OVERLAY"