Merge "Fixed bug with caption not showing for some apps that handle config changes"