Merge "Enable RRS (FHD<->QHD) support for UDFPS" into tm-dev