Merge "Refactoring of auto fill - lifecycle, auth, improvements"