Merge "Prevent the disabling of specified apps" into main