Merge "Hide Udfps icon when shade is expanded" into sc-dev