Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev