Merge "Change the way in which user preferred display mode gets applied"