Merge "SF: Clean up updateTransformHint() processing." into pi-dev am: 36a1fe93c5
am: ed57a4b581

Change-Id: I15b142715c453e17583cb4ab97ccdd57aeb283d8