Merge "Fix indexing error of mobile related controllers" into rvc-dev