Merge "Fix app standby bugs." into rvc-dev