MOB-2339 - Design QA fixes.