Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e am: 248a3e7c Change-Id: Idcd5510fe498581a62b89cd45d9b98d4e55e56f2