Merge "Separate aconfigs for including session id and focused id" into main