Merge "Adjust UDFPS prompt for 3-button nav and landscape" into sc-dev