Merge "Unlock effect chains in the middle of two if's"
tree: 2a51dc4f5028548e2217d079c595f925af7968ac
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/