Merge "Clip AutoFill UI with the outline" into qt-dev
am: 513a57563a

Change-Id: Ib6b5469e7e9ae6e8f2a724be5ee4bcd76f3c8ac0