Merge "Fix return value in View#getUnrestrictedPreferKeepClearRects" into tm-dev