Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev
am: 2f54cf120e

Change-Id: I74b50f6b2cb4d229c2f952da3848a5d0ecff88db