Merge "Fixing preview rendering in device search mode"