Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev
am: 031ec27e64

Change-Id: I2f231fd2be31bf72b9d317da39d017e42798cd56