Merge "Developer option off must not affect laser sensor"