Also fix a bug with initial enabled state of the app-home button. Change-Id: I7eac4932deeced3ac209ad899922ac90f40c87e6