Merge "Improves pointer positioning & remove no-op when expanding"