Merge commit '78077455a89de6485f6d2223648e241ad7240ff6' * commit '78077455a89de6485f6d2223648e241ad7240ff6': Fixes scroll/measure bug in EditText
Merge commit '78077455a89de6485f6d2223648e241ad7240ff6' * commit '78077455a89de6485f6d2223648e241ad7240ff6': Fixes scroll/measure bug in EditText