Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33 am: a40c15717d am: df9252faf7
am: 62be269570

Change-Id: I75bbd4830db86ff06694d970e6a4ca4912707401