Can you please submit a bug to implement toolbars with close buttons on platform itself & mention in it in a comment here saying this is workaround until that bug is fixed.