739d713
home: drop conflicted headers Fixes #24117. (cherry picked from commit 0a58cd00454cc7b57b04f3a4a334584d743d7f7a)