Merge changes I4f1bc2ec,Iaf1a59e0 into main

* changes:
  Fix the transparent group header
  Add aconfig flag for fixing the transparent group header