Merge "Restrict usage of mSelectorPosition and mSelectorRect"