Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev