Bug 961070 - [Camera] Addressing code comments after bug 959890 merge