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

Change-Id: I935898913dbb031b50230a1e83ca0ac17064d29a