Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev