Merge "Guard FallbackHome activity behind permission"