Merge "Refactored Autofill properties that are optimized on application level."