Merge "DO NOT MERGE show correct backup status" into mnc-dev