RF-13654: port photoalbum changes from 4.3.x