master-bc-930

https://issues.liferay.com/browse/LIFERAYQA-6541

No ee-6.2.10 for this because this is for a UI change that isn't present in ee-6.2.10.