Merge "Fix NullPointerException in aspect ratio restrictions" into tm-qpr-dev