Merge "Fixed assist hint not aligned screen bottom when there is a bottom cutout"