Squashed 'source/apps/popcorn/' changes from f5e8514..e7784f8

e7784f8 make sure the flags are always consistent.

git-subtree-dir: source/apps/popcorn
git-subtree-split: e7784f84361c41514fbde220b644c42a6f4afd22
Merge commit '9cf4dbb9c97ff0cef6a9a63d8dec46c18f50bc2b' into popcorn