Merge "Set FLAG_RESUMED = false when expanding PiP" into tm-qpr-dev