Merge "Fix following three issues in SD Card UX" into tm-qpr-dev