Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev