Refactor and simplify home transitions

Change-Id: I499ba571c889b684a759ee84c2a626ef94977855
4 files changed