Merge "Relax constraints on valid ImageReader usage flags" into pi-dev