Merge "app: aboot: fallback to default logo if resolution mismatch"