Merge "add atom and logging for Picture-in-Picture feature"