Merge "Fix Layout Issue in Verifier" into ics-mr1