Merge "platform: msm_shared: Fix display doesn't show expected screen"