Merge "Update desktop mode flag checks to include device config check" into main