am 3b83e5bf: (-s ours) am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev

* commit '3b83e5bf7bea56966860682baa8d7a9894ae78d4':