Merge "Minor style cleanup for Shell caption classes." into tm-qpr-dev