Merge "Removing ENABLE_LOCAL_COLOR_POPUPS feature flag" into tm-qpr-dev