Merge "Fixes foldable autorotation setting being out of sync in QS and Settings" into tm-qpr-dev