Merge "Use bouncy grid option item" into main