Merge "Fade in/out UDFPS when dialogs show/hide" into tm-dev