Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev