* Resolve conflicts and review comments * Corretly handle HomeCoach in manual setup * Fix code reivew comments * Move import back int methods * Formatting fix * Lint fix
* Resolve conflicts and review comments * Corretly handle HomeCoach in manual setup * Fix code reivew comments * Move import back int methods * Formatting fix * Lint fix