Merge "Revert "Enable app handle on foldables"" into main