Merge "Remove embedded titlebar rendering"