Merge "Remove mSingleShot"