Merge "Modify logic for showing the Unsupported Display Size dialog" into aosp-main-future