Merge "Ensure text is visible when choosing pattern" into mnc-dev