Merge proposals dependent on lp://qastaging/~cypressyew/checkbox/fix-pygiwarning-camera-test

1. fix-pygiwarning-camera-test
2. Dependent merge proposals