Resolved issue with screens

Change-Id: Ib92a586cf762aac18a1d3e08688196cbdbfcb383