Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev