Merge "Do not force verbose logs on for anything including ComposerCommandBuffer.h" into main