Merge "No need to show views if isSkipPrompt is true" into main