LMW-85 Changes from @juanferrub revision

https://github.com/liferay/liferay-screens/pull/46