Merge "Fix QS Detail header touch target" into oc-dev
am: b25f52c042

Change-Id: I7ec755fdfda3014aecdcfa7ff47ae0c39d3bff92