Merge "New aconfig flag for adding  last focus id and session id to ClientState bundle" into main