Merge "Improved intant-app on Autofill CTS:"