Possible Fix for General UI in RC for a few devices

Change-Id: I7ba5c19a8fe181e6de53778ca4f55248b1903ff5