Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev