Merge "Add new unit test for Picture creation corner cases Simplified before & after matrix comparison renamed variable Address code review comments"