Resolved issue with screens

Change-Id: I392c203a81ebc94d3110dedf9500e8e7c8dac7d2