Merge "Show bp without sensor icon before credential view." into main