Merge "Fixed some activity visiblility issues in picture-in-picutre mode"