Merge "Not spamming logs with "Hierarchy before swiping up to home"" into udc-dev