Merge "Mitigate Resources leak on API 21+" into mnc-ub-dev