Possible Fix for General UI in RC for a few devices

Change-Id: I676df1808d488204115a5b2cc6533df78ed668d5