Merge "Fix home button"