also revise size() method of Picture for proper aligning. Change-Id: I58a0886968f6058e65a062477e2a873224d8ea8f