Merge "bootstat: Remove long key press check" into main