Merge "Fix issue #4999574: Disabled system app not listed in Settings after reboot"