Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev