Merge pull request #8978 from Ebola16/RS Android: Settings and Emulation activities skip (Tv)MainActivity library rescan