[AutoBouquetMaker] fix bouquets place holders in main bouquet.
Revert "[AutoBouquetMaker] fix bouquets place holders in main bouquet."

This reverts commit 57d90a828d169748c9a3a6377aa3358f08006f00.
[AutoBouquetMaker] fix bouquets Hide option.
Merge remote-tracking branch 'upstream/2.3' into 2.3