Merge "Remove background override for sw720dp preference panel" into lmp-dev