Merge "Fix: Disappearing home button"