Merge "Match both direct boot aware and unaware when updating default home."