Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev