Make megapixel limit editable
Merge commit '2760246' into dev