am 8d4d469c: am d7aeba9c: Merge "Fix testActionNextAndPreviousAtGranularityLineOverText test" into klp-modular-dev * commit '8d4d469c': Fix testActionNextAndPreviousAtGranularityLineOverText test