Screen flicker fix

Change-Id: Ibd2a6b6e495aefff1768f8f7899ad1eca90d16bd