Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev